vpatch: fix display for ignored conflicts.

We need to make sure we display the 'before' bit, not just
hide the 'after' bit.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/vpatch.c b/vpatch.c
index a4ac9ce9bdb2e748404457ef30b8349e610aa899..9e56e938de694035b0b533434d2c6e64be9a5a94 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -546,6 +546,8 @@ static int visible(int mode, struct merge *m, struct mpos *pos)
                        ignore = 0;
                switch (stream) {
                case 0:
+                       if (ignore && (mode & RESULT))
+                               return a_unmatched;
                        if (mode & ORIG)
                                return a_unmatched | (A_REVERSE & ~ignore);
                        break;